From b0f2df4dfe49beac0d90582998508edbd806130a Mon Sep 17 00:00:00 2001 From: Nishant Kaushal <101548649+nishant0708@users.noreply.github.com> Date: Tue, 28 May 2024 15:18:05 +0530 Subject: [PATCH 1/2] enhanched yr Ui --- package-lock.json | 15 +++++++++ package.json | 1 + src/assets/icons8-book-64.png | Bin 0 -> 492 bytes src/assets/icons8-minus-1-year-80.png | Bin 0 -> 780 bytes src/assets/icons8-notes-80.png | Bin 0 -> 991 bytes src/assets/icons8-syllabus-80 (1).png | Bin 0 -> 1295 bytes src/assets/icons8-timetable-64.png | Bin 0 -> 918 bytes src/assets/icons8-youtube-64.png | Bin 0 -> 635 bytes src/components/page3/1Year.css | 41 +++++++++++++---------- src/components/page3/1Year.js | 39 +++++++++++----------- src/components/page3/2Year.js | 45 +++++++++++++------------- src/components/page3/3Year.css | 45 ++++++++++++++++++++++---- src/components/page3/3Year.js | 39 +++++++++++----------- 13 files changed, 138 insertions(+), 87 deletions(-) create mode 100644 src/assets/icons8-book-64.png create mode 100644 src/assets/icons8-minus-1-year-80.png create mode 100644 src/assets/icons8-notes-80.png create mode 100644 src/assets/icons8-syllabus-80 (1).png create mode 100644 src/assets/icons8-timetable-64.png create mode 100644 src/assets/icons8-youtube-64.png diff --git a/package-lock.json b/package-lock.json index e0c2f92..48d1287 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "react": "^18.2.0", "react-bootstrap": "^2.10.1", "react-dom": "^18.2.0", + "react-icons": "^5.2.1", "react-router-dom": "^6.22.2", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" @@ -15644,6 +15645,14 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "node_modules/react-icons": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.2.1.tgz", + "integrity": "sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -29935,6 +29944,12 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "react-icons": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.2.1.tgz", + "integrity": "sha512-zdbW5GstTzXaVKvGSyTaBalt7HSfuK5ovrzlpyiWHAFXndXTdd/1hdDHI4xBM1Mn7YriT6aqESucFl9kEXzrdw==", + "requires": {} + }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/package.json b/package.json index 4778751..0b54b3e 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "react": "^18.2.0", "react-bootstrap": "^2.10.1", "react-dom": "^18.2.0", + "react-icons": "^5.2.1", "react-router-dom": "^6.22.2", "react-scripts": "5.0.1", "web-vitals": "^2.1.4" diff --git a/src/assets/icons8-book-64.png b/src/assets/icons8-book-64.png new file mode 100644 index 0000000000000000000000000000000000000000..c20fc54171e4edd806e101ba29ec494093b7f4f6 GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vnc zPZ!6KiaBp*`}!R=5O7Oxv|xQRp^9^doW1)4t`$k_>>ew3c~GHhq}*-M_n3zvhAI0&L+-Z&wgq~pCjU>0ypzcl(Y{FkK&u4X4!*tb zOuOZr0xwT~|6-cMwx$EywqLoo=zYEY|8&OL^BUA{9|&VzQozWl*;6IoqZ84~a7l5; z%XFtw#f;XZ=mT7;#tG3!OB=pU4KiXWWuJG#U%XEB#2dGZX8EOXZ7!^~EHlfjWjdvm z>dsC0Q~OPHLQ+e^z8#9Q8vmPi3mb^*DJ0mj%$&iw{9E?7nF_+j53khy=TYWf#cv}h zE->S+#x3S((T4kckM-SF-DA>>ad6;Te2+cQk>AmVT_oFoK>hRs z#rB4!7vyGGoK}1w8_^lKOKr0#+qxqLmaH<<3KEo-H#`scz17xUh3)0i|9b8puQu`d y-d)9=kvZM|14~WvB|nTmXuaO~te4L%)_VJ%i;hgH2Al^h7ckc>WcPY6tyTN%Z;t8N z7eE3wx|Zz)x9dlf)yF;`QLB+H!pn~ zQt^rD`kHF>qX!OEDj7`Nc!2ZuKh2*9iuO)WyJ}v=&{#Y*sjX7myx`tM!5bke7dlz2 zCOW7KS-fI8-s;5U9+EK8(qjQXXNgjyA6)W<3)5VW1;QY~$65k6xOJG<=S2HW)wXUt z!1*Baskl;k@RL)13I$w0(%S2_8*7>7m}hDqxcHXkR}5ssnys0w?t&N?pOP07lrgjbDe+87C9Sl zi&e|lb){Pbu733ZGHFi+`N~+GvD5H ze4W*GAk3mXbXzww#~Zu-+ZkiFU4P$T+kEXRN8{d0%?FZ~Mt(oE?_Q@(TMa8)!_`wO z6LxiYTxONK@iIz>wsU+;AtM-2P)fs7w z^EPPk{@gspB`#I1%|_9d%2 zER{E)Nh*{GY?bqKS(Rb2yxClycD+y{a9Ym2$SN*xN~?FjfCB~hHA>tov$Nt%Rz+AW z?*njm84}g(tat#dG1;kOz!TsH{xRM}-hf&Z0~0MIs);2>rG2kSdDrom@n-V0Yo!uJ zvYKG5$WxK0_ye2=`ZEt{Ca;-9tMa5#m9~ltnWwZPuZhH2Yx1PQIccCj3tV1<#C&40 zCr=vtPv#-OdM!hgyxna+w+nbD&piV+*zBa20$D-i$#Vm8zum}dM-hgnLl~ZDAvAl{_bbv78#{;3p|#HP2aQbu)#rSo5M6 zh~){x3xQawfwt1tM}aldHPD4TZv=+C&WlbUju**M)j-Uo?Nq^1rL=$1)IcoBYt=t5 z1cv;#ZSVr=@(%;S*FfM-{%&9z7&MW#?e;I|8c2OV-aN3NZ6*5%Y%wLTRsXyYxKe<# z+JFDI0Z--loGE#2^dV@0)AHJ3IX)@JZzSl^10V z1a8YKZ)xW?0|$W<+RXf_)5wdi1_C`2d5WQudp61hgXy%5LEx~wZl*-;uuLoqHsu9d z1F6f&_u!4lxgnL#YCp0Tb@Q@L>_}czHIVuy#yqlei8Bq8$FwYQ`V93wo*D>Tp_s3- zTWZNS8#W0_Aobl)uQh2Z5+BKC?sevR8)*%szL7CsC|_3TY^Afy=wDDZ5I8OpS6k_1 z6>6YwB!Mvq#L?cEtm-weTcjFj5icSzWV{eas(~E~tfd;*fxwXQB85Z73xPQPPQ=uA zCauQRwHk=$$L)^GC@F8chT5mX>2r$1Yk_YH0h$TquM9`qajD4 zMBbQ;MRCMc!`Fz9t4`!KMB=1Y6GLQ9#^5IM5{X12kw_#Gi9{kZ!9SvaBQ~Z*=Cl9+ N002ovPDHLkV1i;^#S#Dj literal 0 HcmV?d00001 diff --git a/src/assets/icons8-syllabus-80 (1).png b/src/assets/icons8-syllabus-80 (1).png new file mode 100644 index 0000000000000000000000000000000000000000..3a2cd5ce64715e2c10f8e1b343d3f616f745f16f GIT binary patch literal 1295 zcmV+q1@QWbP)>+%#)}+02#a8h7)=EK0FcB3D+i+&Y4Ia*HO2%zFmPc7k*xSZSc2@&)Xvjx zrFUnuv)$EIHPcU0Nl$gv`#$w_*IQLRsY;R>HEPtT5e$H(z%Jlh;5zUR@D1=1aHns6 zK?4{B&d?rT0{8gl86U`XJ7~zP#Ok)(Y;SiS>Jqv11*s<@n*ecCeIS_aX%~r z2Jn%@8Jefe6Do5&=>`D(zyaV_%EN$V-^9bz`n|G5KjXlNX@gGzM<^LN`zdfbmsd9S zS1z2@m~oNV+CiOJLY2g&BfG%EsxqGV0*eqM6aigwDNKM|>{>`2S6s@jQeK6cH~ z?H?+U$2Qr#*cAfK2NSe$hc|jbz%RG{P9g7 zcK*~c(3yZ~9Rmvp7z@1f$2WmqjDfVew=1N*uog}o3V6CJ1dIjV`Qw{F?EEQdEnH%^ z?*16)Sim|4R*7KWz*rD+7d}(Rz+wWXbqp*ZU@Y*?AKwIG=TAv7&=*1$Fs;7_77#EN zc;}CA0=*amslNvoqPz@~s$=T*^;`@D)&P5f3zjJV0-tF2=h8MCx`$Q9l+AEKw$`}j z?KK9{62R=*Je3pRJn$N@x&vFQRp)%}0i2SLSq~uEF3e09yqxQTW}EC|z#RocfZ03u zfsPr-FrmB$%56`Vm>A~ya6MuC06PGB?80PfY2ZJDkcy0=qhM^)FxEAlZQ zpT@V1F>zcT^gIxF5O@#x!y^B;*0fjj`yI3QxX7tSrmprJAC}GEcvRz7uDOhqbV40W0x`;~2OY->&R- zO&6Y{tC{%t2(SluSEK4rn(tlFdUi@_LU~P<8C9J{K%@pKi9hXBpz<0jGo(6ZD)c>YyJ`XZ9h|_iPyx@j z5pY<`EhEx>60J{ZP)NndUQZ6*M&tJ5MdTaqGu5nVF@ zFsH_Q%aRI!F74BtiE&MJxnRW_^0aP6zia@!1!n4Oe5}h1pr*87KGp>QjYJ(O;1+PR z&c?^OY%`!NvIfBV@7`P&YXGH`4S?B_6*~Y?$rJ#n+>!E30f5RGDd0IU?OjrfYDfz3Vv7)f+~SJsOX@l8M&No^3zQzu?;YpwVC=1PyYVKHsw zSL;WeO|Sk^NX(;Y0L}xy*9pKo1rTTZ!DbyZ1)z2p)%3BgqmiA%hDtV%vwge6xE+aK zhXX|hAe$V~sLQx&dqd6778$^OHSKd5S8WH>e4@wzW^7*GvIGz>uMb5Au%M>t@A|EL z$lGaP+orbPZ5m{B3Ud`F1Awa9ze3)u+Pwb2k=sTk}?;Nn=jL6&rw4z>5OB*VCvh=>ew47D59kM>Lk4aSla3 z2)Jx=95#rvTki`+!;vonT7V}B2)!9cKJL6+m~M=G63bUxPqhOwg)c}lGw|!sHUBfw z`Bc9`O0KbhtBFgRc|Fw)=*DKNmTs*ZPh@*p^TXbad?U#fcjAuFM3demJR1QAfphY6 srny0`&AtM!wXRa8e*+2%3W{>kAIB2h6`Tm1K>z>%07*qoM6N<$f(|T`$p8QV literal 0 HcmV?d00001 diff --git a/src/assets/icons8-youtube-64.png b/src/assets/icons8-youtube-64.png new file mode 100644 index 0000000000000000000000000000000000000000..15451cf6a1a2a921a3ce5769a9059c105a4e3103 GIT binary patch literal 635 zcmV->0)+jEP)e7_Z$+1&y ztFekGNCrhM9Xgdz+NoG@X(=>A3L%9`(jT_*7dSeJ7W$S4AK?(hqu=Mb-b24H$d=sq zdmnPo^W5DNMM^29lu}A5rPO}`=YXrgO<)ul1Ezs0FbmXxw+TKCVAFmY34c?wHLAAe znC-#zQZT(mz5thjC%_l7%k=gb=yQGY1>lfy902{UPQDk|Av_(R$3*~BgzK)00q-;6 z`Xm|{fkDDIAPHcE@C{1>ctH5>NdkC9_+Cf?SR#B2k^t5nH}eyi2aZY4nk0ah<7U3w z;|>8$($SOzujy50Cs%`@YfC3GVXOG0UV?i zK&)mF*mGEOUlPCvQVzh@JrCRgzB#Dbl?2e`6at9VFFBYpyFpz725<$K%fcnFONs#i z7l29gy{rs^ZPJ?siXQ%P;%RU@g>`_L{@#$$g;2}mO3*xOd}{9xGP@LBcifD*wsXKO z4^!;FtV#k{bll7lut7k#!!HTnb4dXA3Ez|?fD&i?q3CtOcTEyNF2&K>hmYnQP8@&% zOc1W|ND8=UUo?iM?d0XCVO}+RTBrN+-r4K%Kg^~B`|QqKS6O9xduX0BM!xWSV9WzI zfU@1DQURU;Gj
- +
-

1st year

+

1st Year

-
+
- +
Quantum {/*

*/} @@ -30,37 +29,37 @@ function fstYear() {
- +
- +

Lecture

- +

Syllabus

- +

Timetable

- +
- {/*

Hover Me

*/} +

PYQ

- +
-

+

Notes

@@ -69,7 +68,7 @@ function fstYear() {
- +
) } diff --git a/src/components/page3/2Year.js b/src/components/page3/2Year.js index 07e6cfc..d920c57 100644 --- a/src/components/page3/2Year.js +++ b/src/components/page3/2Year.js @@ -2,72 +2,71 @@ import React from 'react' import {Link} from 'react-router-dom'; import '../page3/2Year.css' import Header from '../../pages/header'; - - -import quantumImage from '../../assets/5th.png'; -import youtube from '../../assets/ytt.png' -import timetable from '../../assets/sec-3A.jpg'; -import syllabus from '../../assets/syllabuswt.jpg'; - - +import quantumImage from '../../assets/icons8-book-64.png'; +import timetable from '../../assets/icons8-timetable-64.png'; +import syllabus from '../../assets/icons8-syllabus-80 (1).png'; +import pyq from "../../assets/icons8-minus-1-year-80.png" +import Notes from "../../assets/icons8-notes-80.png" +import youtube from "../../assets/icons8-youtube-64.png"; function sndYear() { return (
- +
-

2rd year

+

2nd Year

-
+
- +
- Quantum + {/*

*/}

Quantum

- +
- +

Lecture

- +

Syllabus

- +

Timetable

- +
- {/*

Hover Me

*/} -

PYQ

+ +

PYQ

- +
-

+ +

Notes

- +
{/*
*/}
) diff --git a/src/components/page3/3Year.css b/src/components/page3/3Year.css index 7ec80b3..644c613 100644 --- a/src/components/page3/3Year.css +++ b/src/components/page3/3Year.css @@ -1,15 +1,31 @@ .cards { - display: flex; + display: grid; justify-content: center; - /* flex-direction: row; */ - flex-wrap: wrap; + flex-direction: column; + grid-template-columns: 1fr 1fr 1fr; gap: 15px; - height: 50vh; - margin-bottom: 100px; + + } + @media (max-width:950px) { + .cards{ + grid-template-columns: 1fr 1fr ; + } + + } + @media (max-width:650px) { + .cards{ + grid-template-columns: 1fr ; + } + } .cards .red { - background-color: #f43f5e; + background-color: #fa536f; + text-decoration: none; + transition: ease-in 2s; + } + .cards .red:hover{ + background-color: #ff002b; text-decoration: none; } @@ -23,19 +39,31 @@ flex-direction: column; flex-wrap: nowrap; } + .cards .blue:hover{ + background-color: #be009c; + } .cards .green { background-color: #22c55e; } + .cards .green:hover{ + background-color: #00732a; + } .cards .yellow{ background-color: rgb(198, 198, 45); } + .cards .yellow:hover{ + background-color: rgb(222, 222, 0); + } .cards .pink{ background-color: rgb(49, 44, 38); flex-direction: column; flex-wrap: nowrap; } + .cards .pink:hover{ + background-color: rgb(78, 77, 75); + } .cards .syan { background-color: rgb(13, 75, 54); @@ -43,13 +71,16 @@ flex-wrap: nowrap; } + .cards .syan:hover { + background-color: #399059; + } .cards .card { display: flex; align-items: center; justify-content: center; flex-direction: column; text-align: center; - height: 100px; + width: 250px; border-radius: 10px; color: white; diff --git a/src/components/page3/3Year.js b/src/components/page3/3Year.js index d0dcb1a..87f8a78 100644 --- a/src/components/page3/3Year.js +++ b/src/components/page3/3Year.js @@ -2,13 +2,12 @@ import React from 'react' import {Link} from 'react-router-dom'; import '../page3/3Year.css' import Header from '../../pages/header'; - - -import quantumImage from '../../assets/5th.png'; -import youtube from '../../assets/ytt.png' -import timetable from '../../assets/sec-3A.jpg'; -import syllabus from '../../assets/syllabuswt.jpg'; - +import quantumImage from '../../assets/icons8-book-64.png'; +import timetable from '../../assets/icons8-timetable-64.png'; +import syllabus from '../../assets/icons8-syllabus-80 (1).png'; +import pyq from "../../assets/icons8-minus-1-year-80.png" +import Notes from "../../assets/icons8-notes-80.png" +import youtube from "../../assets/icons8-youtube-64.png"; function TrdYear() { @@ -16,14 +15,14 @@ function TrdYear() { return (
- +
-

3rd year

+

3rd Year

-
+
- +
Quantum {/*

*/} @@ -32,44 +31,44 @@ function TrdYear() {
- +
- +

Lecture

- +

Syllabus

- +

Timetable

- +
- {/*

Hover Me

*/} +

PYQ

- +
-

+

Notes

- +
{/*
) From bdb0e3e75105a1e90bc7b0c913c17b9d3257dcb5 Mon Sep 17 00:00:00 2001 From: Nishant Kaushal <101548649+nishant0708@users.noreply.github.com> Date: Tue, 28 May 2024 16:46:26 +0530 Subject: [PATCH 2/2] removed background color --- src/components/page3/1Year.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/page3/1Year.css b/src/components/page3/1Year.css index c824d63..68bfb78 100644 --- a/src/components/page3/1Year.css +++ b/src/components/page3/1Year.css @@ -10,7 +10,7 @@ margin: 20px 15px; border-radius: 10px; - background-color: aquamarine; + box-shadow: 5px 5px 10px #bebebe; } .container{