Skip to content

Commit

Permalink
chore: infrastructure almost done, still need to setup the API proper…
Browse files Browse the repository at this point in the history
…ly and intergrate. Split the backend, one local and one open source
  • Loading branch information
WomB0ComB0 committed Dec 16, 2023
1 parent 355a18a commit 3072902
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 51 deletions.
39 changes: 39 additions & 0 deletions frontend/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
**/*.json
**/*.js
**/*.css
**/*.html
**/*.htm
**/*.xml
**/*.txt
**/*.md
**/*.markdown
**/*.yml
**/*.yaml
**/*.csv
**/*.tsv
**/*.ini
**/*.conf
**/*.config
**/*.properties
**/*.toml
**/*.lock
**/*.log
**/*.sql
**/*.db
**/*.sqlite
**/*.sqlite3
**/*.sqlite2
**/*.sqlite-journal
**/*.sqlite3-journal
**/*.sqlite2-journal
**/*.sqlite-shm
**/*.sqlite3-shm
**/*.sqlite2-shm
**/*.sqlite-wal
**/*.sqlite3-wal
**/*.sqlite2-wal
**/*.sqlite-wal-journal
**/*.sqlite3-wal-journal
**/*.sqlite2-wal-journal
**/*.sqlite-wal-shm
**/*.sqlite3-wal-shm
3 changes: 2 additions & 1 deletion frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ dist-ssr
dev-dist/

.env
.env.local
.env.local
reminders.txt
10 changes: 10 additions & 0 deletions frontend/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"trailingComma": "all",
"singleQuote": true,
"tabWidth": 2,
"printWidth": 120,
"proseWrap": "preserve",
"useTabs": false,
"bracketSpacing": true,
"arrowParens": "always"
}
1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"firebase": "^10.7.1",
"framer-motion": "^10.16.5",
"lucide-react": "^0.292.0",
"million": "^2.6.4",
"react": "^18.2.0",
"react-day-picker": "^8.9.1",
"react-dom": "^18.2.0",
Expand Down
16 changes: 9 additions & 7 deletions frontend/src/app/App.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useEffect, useState} from 'react';
import {navLinks} from '../utils';
import {GDSCIcon} from '../components/icons/components';
import {Button} from '../components/dom/index';
import {ThemeProvider} from '../components/providers/theme/theme-provider';
import React, { useEffect, useState } from 'react';
import { navLinks } from '@/utils';
import { Icons } from '@/components/icons/icons';
import { Button } from '@/components/dom/index';
import { ThemeProvider } from '@/components/providers/theme/theme-provider';

const name = 'GDSC Farmingdale';

Expand Down Expand Up @@ -81,7 +81,9 @@ export default function App() {
return (
<div className="flex flex-col items-center justify-center w-[90%]">
<h3 className="mb-3">Events</h3>

<Icons.logo props={{

}}/>
<Buttons/>
</div>
);
Expand All @@ -102,7 +104,7 @@ export default function App() {
};
return (
<header className="flex flex-col items-center justify-center gap-2">
<GDSCIcon width={100} height={100}/>
<GDSCIcon className={``}/>
<h1 className="text-sm font-bold">{name}</h1>
<Links/>
</header>
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/components/build/footer/footerbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { Footer as Foot } from '@/components/templates/index'

export const Footer = () => {
return (
<>
</>
<Foot>

</Foot>
)
}
3 changes: 3 additions & 0 deletions frontend/src/components/providers/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { ThemeProvider } from "@/components/providers/theme/theme-provider";
import { Events } from '@/components/providers/events/Events'
export { ThemeProvider, Events }
9 changes: 4 additions & 5 deletions frontend/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter as Router } from 'react-router-dom';
import { NextUIProvider } from '@nextui-org/react';
import App from './app/App.tsx';
import './index.css';
import { AnimatePresence } from "framer-motion"
import '../src/styles/css/index.css'
import '../src/styles/global/globals.css'
import '../src/styles/global/globals.scss'
import App from '@/app/App.tsx';
import '@/styles/css/index.css'
import '@/styles/global/globals.css'
import '@/styles/global/globals.scss'

export const RootLayout = ({children}: {children: React.ReactNode}) => {
return (
Expand Down
12 changes: 8 additions & 4 deletions frontend/src/providers/Providers.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { FC } from 'react'

const Providers: FC = () => {
import { FC, PropsWithChildren } from 'react'
import { ThemeProvider, Events } from '../components/providers'
const Providers: FC = ({children}: PropsWithChildren) => {
return (
<>

<ThemeProvider>
<Events>
{children}
</Events>
</ThemeProvider>
</>
)
}
Expand Down
14 changes: 0 additions & 14 deletions frontend/src/styles/css/index.css
Original file line number Diff line number Diff line change
@@ -1,14 +0,0 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer base {}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}
37 changes: 19 additions & 18 deletions frontend/src/styles/global/globals.css
Original file line number Diff line number Diff line change
@@ -1,75 +1,76 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

@layer base {
:root {
--background: 0 0% 100%;
--foreground: 222.2 84% 4.9%;

--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;

--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;

--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;

--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;

--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;

--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;

--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;

--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--ring: 222.2 84% 4.9%;

--radius: 0.5rem;
}

.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;

--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;

--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;

--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;

--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;

--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--ring: 212.7 26.8% 83.9%;
}
}

@layer base {
* {
@apply border-border;
}

body {
@apply bg-background text-foreground;
}
Expand Down
4 changes: 4 additions & 0 deletions frontend/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import path from 'path'
import { defineConfig } from 'vite'
import react from '@vitejs/plugin-react'
import million from 'million/compiler';
import { VitePWA } from 'vite-plugin-pwa'
import eslint from 'vite-plugin-eslint';

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
million.vite({
auto: true,
}),
react(),
eslint({
include: ['./src/**/*.tsx', './src/**/*.ts'],
Expand Down

0 comments on commit 3072902

Please sign in to comment.