From b4eca412a77782ad1b648c563cd90ab6846ceef6 Mon Sep 17 00:00:00 2001 From: tomas Date: Wed, 29 May 2024 13:12:46 +0100 Subject: [PATCH] Add Navbar, refactor layour, further tailwind config --- app/globals.css | 14 +++----- app/layout.tsx | 14 ++++++-- app/page.tsx | 15 ++++++--- components/Navbar.tsx | 30 ++++++++++++++++++ public/{logo.png => compsoc-long.png} | Bin public/{compsoc-icon.png => compsoc-mini.png} | Bin public/compsoc-short.png | Bin 0 -> 13610 bytes tailwind.config.ts | 24 ++++++++------ tsconfig.json | 5 ++- {app/utils => utils}/prefix.ts | 0 10 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 components/Navbar.tsx rename public/{logo.png => compsoc-long.png} (100%) rename public/{compsoc-icon.png => compsoc-mini.png} (100%) create mode 100644 public/compsoc-short.png rename {app/utils => utils}/prefix.ts (100%) diff --git a/app/globals.css b/app/globals.css index b325ffbae..f6fce2107 100644 --- a/app/globals.css +++ b/app/globals.css @@ -18,18 +18,12 @@ } } -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient( - to bottom, - transparent, - rgb(var(--background-end-rgb)) - ) - rgb(var(--background-start-rgb)); -} - @layer utilities { .text-balance { text-wrap: balance; } } + +body { + @apply text-textPrimary; +} diff --git a/app/layout.tsx b/app/layout.tsx index 5541c1a26..489fb6fa2 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,15 +1,20 @@ -import type { Metadata } from 'next' +import type { Metadata, Viewport } from 'next' import './globals.css' +import Navbar from '@/components/Navbar' export const metadata: Metadata = { title: 'CompSoc', description: "CompSoc is Edinburgh University's technology society! We're Scotland's best and largest of its kind, and form one of the largest societies within the university.", icons: { - icon: '/compsoc-icon.png', + icon: '/compsoc-mini.png', }, } +export const viewport: Viewport = { + themeColor: '#222222', // TODO: Should be fed from tailwind.config.ts +} + export default function RootLayout({ children, }: Readonly<{ @@ -17,7 +22,10 @@ export default function RootLayout({ }>) { return ( - {children} + + +
{children}
+ ) } diff --git a/app/page.tsx b/app/page.tsx index e929dcb41..425192eee 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,14 +1,19 @@ +import { prefix } from '@/utils/prefix' import Image from 'next/image' -import { prefix } from './utils/prefix' export default function Home() { return ( -
+
CompSoc logo
) diff --git a/components/Navbar.tsx b/components/Navbar.tsx new file mode 100644 index 000000000..cc62e6248 --- /dev/null +++ b/components/Navbar.tsx @@ -0,0 +1,30 @@ +import { prefix } from '@/utils/prefix' +import Link from 'next/link' +import Image from 'next/image' + +const NavBar = () => { + return ( + + ) +} + +export default NavBar diff --git a/public/logo.png b/public/compsoc-long.png similarity index 100% rename from public/logo.png rename to public/compsoc-long.png diff --git a/public/compsoc-icon.png b/public/compsoc-mini.png similarity index 100% rename from public/compsoc-icon.png rename to public/compsoc-mini.png diff --git a/public/compsoc-short.png b/public/compsoc-short.png new file mode 100644 index 0000000000000000000000000000000000000000..5e9bf5989f2423fe2095c0f0653779649cab6048 GIT binary patch literal 13610 zcmeHOXINC%);=>p1Z*flG^iZ0z?B*j1*r!G6r@QM5Tpr&Vkk-(6oeTy_J|Py3(6#R zks<;j2!j%1;VMKF6s0PnQWMGm!_3?@3eMttz90Adp4{C003RL>i*xo_`(5u|`(0~~ z`yA|6PL};bmLQ19R;$b%2|^-(An4xGpMmA;kVG^1A?a^s3qP+WOdR%>g5OD>RgSg< zv277SFn1Be5SW;62_jO5Al`csguyX_Pz*~gTw?@(*yZP9^{uTfu^6tU2`SoiLISR6 z@QrZ#d9ognrE5|ShLxWZ4-*DClHJ@fIW1e+!vkxd`HTOxoh zF?vn+7Cp8|PfavQnXpys!wF)dyy%-ooJgGsqpc5I>k{E&Yh&OO8m#5*8@ka?D>^t# z^b}zfZ2*_Sei7bebntf};ReyhDj)7JfNPOiTZQ~^OT;E)6&G6vaz*GCKXR#-j+Ty! zi7ZKyMq7NpHE=Yy9C;jmGgb+RhzK*#)@CpmT8yu>Lbv#9f4OYgGHo4QZCzbWxI;61 zYe7{Evf-j$`f@?z1H@EFv&8gcObIy)iU0!dOK`^rBB+AN`C7{8s#?knoXd z!34EMf6@L@OGo?D*zl;4$ZBA}CD0GvEE?bBOQR2Wj>-L2G<`YgU9A@iU43y0`cy;BL;fXss zC!g<_>9~@Zxh#>$EVVoKeC4sd23ajNcP!8Foa!!D?CUNpY^xs%>9I1EuQ)xZOruLm z%aIh5_`hH1YlUqY&PiX$Qq(SqadW+%?ABOy!Lz>AhY0 z)WtmIUArE(RoE_QsaoI1&mW$n?;e+K$dOJ>9qxaXlE%NbnkKw!;eDlENVogv5$?6d zm$!IDd@OlJO9*&Q+no9wj|<+ixR1S8h2L9#n0eHVjm z8VYii$<{X#uq)&4Wv^}YefPuh&Y0hui>}A?^J+LHg3T5D4)+-Y-Axz%m~6jcd-On6 zyy@lx&9Bl-_%uXwMgMix5L73mPp$rQ|VQD*B(xRZdwlY=ci#hj$<+?05A6sSj(ej*XTe|hEKY`!mDtxtaO0F?@8E^(w~^j zsEbYhm~Lyqk;TpGw%CysG+Kv4Sq1j@A~>?{7v~e$kv*^&e%hUe{dHJFQR#cLzQ&GB z0e@FaHpTw3e`YeBrg;WpM`nY+{{`S0d%IUWsnGU_?EakA5b9TKpBA^(v&5(9 zX<|pdYe`jkivQH|uDIb-3s4GmaX*Dn5>40#}g8rU*K}_1O z9M1>0-?;VPFDc~4@&^}l<_(vdaJdZc8~3yHll{GuFzVjGl9_qSad6Zid-*A+W0SPJ zT;=VH3M!a}>nTbd{KckYOy&&B3^^RG2QdEgyNj{uwxndPPSE!_!#T{5t9)SMgkvwa zh-81iM%^4UDF@=*f7KeBbZ9iqgRb*%=#K(JauU{I(=Hk50PiQV(-6tokSvq7Uzv_f zqzy$)Jma(%#ATj~w6t&4$ zu2$qdt6%ETBae>S*L8JSz$=EZtG;-3ov>a|)ch=!V1-By@AuI=6CsBH$$=0*SG^dI zOoh|rDhp?w+lls=!|oJSZeqqqYpwDJCbRmX+MHctj9Bdu;(nR;X~+};Ar7&8Ma8V3wS9YZ%5pJ>s3@QiPqNP*ne<>ve>r4!Ma%Y$!f(OS z3yo9DbX!n)jmhP-zUz-%O3TRFYA{(e;{`MH4P){)aUmCU77FY6U9~qK7AZz^JKeed zu@7kc!R`C&^DBlF?gkroU}3^~3Mn?oU@GRkmmBB}H~S*IG`#XaZ=86v6NO6dnG;35 zsICgZHWy8jopHX0L{X5;2fdNsm#c(rPQbSGcSftk028cWh~T(;{~mg&nQ@OtfVDWfGi8~YGG^7WVa_NT_qRcIA4qE5O+8`V$Hc7G-!Zfgnbfl;QPn-^j z(=?4P1*w(kvk#kogw%I7-xY^W4N|Mr?A6$`7j&LV-qSIHzzhUIqsti6Sr7!5GG<`< z$-?-wyVJ2r1=zPLI1goR(m_tHQdU11o8H4l$mWi2ni!wY zVK@5AAxoW6t?^L$=GLCFf9@}zMprf&{(Oz)53^`p!bu0qN1$X)mMokU09CoK|E4~sQn*nr1cJ>&@ zY_+ahFv_)+91vf^gQpIQ*DGrQETtx_S`3uhf&icD`k zL43vkYKOKNYC0^}`|Mn+Pk=EgAxug5Rn&4s+ar*HtUfzui%dhXwGE|Rl}Gp-22uQX zfQ*$WNGRaTc$OH&Jd1NS6nh9ws`&U;&WnVq2*%R}cBG!;1hkyUbbvo{%Mhxu*@ggr z(T@hWq*@Q*y^>g^hv2V+ExqoCCoGf??!jvHJC$03;kN_$L(Wb?>5_5+_}gChqI#WT z0Q`*kktD)82iEj@)eE7>R0w&bQ0bBc+F=f_gL1)O*>;pPDnT4n*R7g^N-EYB7{B`d zyOW5qoxrG0%l8zbr!VNp96P%PWQqU<@s~r^m|G+-HTx~EDwKX%&5X2c>=Fu`ZRV|8 zI<1?3P3Beh$$=h|_P2V=3cAv4XF7-e5%26A>TKG6ODLz$DTxy*D=OUp-81tS;qYLE z`sqKUSxcn^{T1=K&yQsuk{u8%d(hmxoEBfNxco-PMP^sp84Yhm<+zxBAD63N%AU&I zX2WTI_TIM_ZF;3)kkrHGGrUkRTmdZCQwK{>{AWV2l|o)mL5ZG92jtTee^W%vDFfz| z{qT~7Xc7Qn+!U!hgqZ2254x}5M?<{1WB?~J>?}P|fF?nJChKjPfC;<~2>kT^TckQz zO%UxS%g$2tWG=8Z&tTSe#3r3o*p*)1n{y2D#0jYHq6=Upu;G4XIOHXh!5@C7N=*5S3O3$&*|WOA)NdY~URBqp!9qG0RaWE5>zO;HJ84Ho zv8iWZjV_I@B$GP(MQeZa`zFyKk3!=z*9`^KC8T5}crbn>SOUpdVXt1*J^8KiDtWy0 z7XG`?^LFN5c8$&bL);B-oM*Ql-GI7kOez~{vq_n=M*}8Gvu_|XFPl|^HUm-)+N4rD z)mMu38NpfxyMf)WkthpGOM(Er)%XDAZ^{dHpp%K4Pl@w4jeZMuAf19ODD%r5g9QG@ zcigp+IEMG;Z+;#zYy!?FdNc>;zbV* zxpY0vJk>C~AtV2Gf?_}if9tS}k=aNljZQ7S)6sYT)#)&XIvuo1lGWRt;#A3M0;${N zNh46I%!P_NPgiEUcwZrPZh}Z2RwrPgm?kxDckocvp&^T~CzRLtx79LPp2owl$-+)P}Lta-;tek*0lQP&5$~bfa zJsDsDm4)B*A#~*C6%BjIfHNVUIgOqH#eRm(a%Hg>(vzTBFWCulKoR$Znx@e?K)~-UfVRbnWDg`k z-nv5DV%yCrNP+&aEqL`| zD`;DMtywH?(~y;L09M@>J?D^^mMj|>|9s#(R8X)oVU1?qZ3{z0^_?zPscXAB3z;I| zlq}NNV-Nb|519y^o``}puCi4WJS`yp*8IJCZXDNP!PC%`B2P380c=m z4Q>LxWU5e2mmj-1h99HV1BX&dggj8%#7*FsmFq6qj`cw?=mY-VIrtz>1N1?%)jNC; z*9rQdb7eadi2+~G(>XTQX~+}-+BVX3;{kZy_BnH1h4nC(M zMXIAJlwd7{GIaVvE`9?^!6!2*ryXKFPNS~|e-~PJq7M%;DJJwZnO7w7w35N!)kj~h zz$G#PTqoAc;Av^V!c11Xu?N3_2K*;-rsHY3z+%!|vt=B(Ptp0$1NZ4w|DOv5DS@(A Y^~Q@!{L8c9KL8O{7Ix;D%e{8|3s*vQH~;_u literal 0 HcmV?d00001 diff --git a/tailwind.config.ts b/tailwind.config.ts index a7093e341..9ae3080bf 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -1,21 +1,26 @@ -import type { Config } from "tailwindcss"; +import type { Config } from 'tailwindcss' const config: Config = { content: [ - "./pages/**/*.{js,ts,jsx,tsx,mdx}", - "./components/**/*.{js,ts,jsx,tsx,mdx}", - "./app/**/*.{js,ts,jsx,tsx,mdx}", + './pages/**/*.{js,ts,jsx,tsx,mdx}', + './components/**/*.{js,ts,jsx,tsx,mdx}', + './app/**/*.{js,ts,jsx,tsx,mdx}', ], theme: { extend: { backgroundImage: { - "gradient-radial": "radial-gradient(var(--tw-gradient-stops))", - "gradient-conic": - "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", + 'gradient-radial': 'radial-gradient(var(--tw-gradient-stops))', + 'gradient-conic': + 'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))', }, colors: { csred: '#CE3234', csgrey: '#222222', + background: '#222222', + foreground: '#353535', + border: '#484848', + textPrimary: '#FFFFFF', + textSecondary: '#A0A0A0', }, fontFamily: { 'space-mono': ['"Space Mono"', 'monospace'], @@ -23,5 +28,6 @@ const config: Config = { }, }, plugins: [], -}; -export default config; +} + +export default config diff --git a/tsconfig.json b/tsconfig.json index e7ff90fd2..1ee948c47 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,8 +17,11 @@ "name": "next" } ], + "baseUrl": ".", "paths": { - "@/*": ["./*"] + "@/*": ["./*"], + "@components/*": ["components/*"], + "@utils/*": ["utils/*"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], diff --git a/app/utils/prefix.ts b/utils/prefix.ts similarity index 100% rename from app/utils/prefix.ts rename to utils/prefix.ts