Merge branch 'v3/api' of https://github.com/opensummerofcode/selections into v3/api

Author: Tischa

.gitignore

@@ -19,6 +19,7 @@ node_modules/
 .npm
 
 # dotenv environment variables file
-.env.*
+.env*
+!.env.example
 
 next-env.d.ts

client/.env.example

@@ -0,0 +1 @@
+NEXT_PUBLIC_API_URL=http://localhost:4000

client/.eslintrc

@@ -1,6 +1,6 @@
 {
-  "extends": ["airbnb", "plugin:prettier/recommended"],
-  "plugins": ["prettier"],
+  "extends": ["airbnb", "plugin:prettier/recommended", "plugin:workspaces/recommended"],
+  "plugins": ["prettier", "workspaces"],
   "env": {
     "browser": true,
     "node": true

client/package.json

@@ -22,15 +22,20 @@
     ]
   },
   "dependencies": {
+    "@urql/exchange-graphcache": "^4.2.1",
+    "common": "^0.0.1",
     "evergreen-ui": "^4.26.0",
     "firebase": "^7.14.0",
+    "graphql": "^15.5.1",
+    "graphql-tag": "^2.12.5",
     "next": "^11.0.1",
     "normalize.css": "^8.0.1",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-dnd": "^11.0.0",
     "react-dnd-html5-backend": "^11.0.0",
     "react-dom": "^17.0.2",
+    "urql": "^2.0.4",
     "zustand": "^3.5.5"
   },
   "devDependencies": {
@@ -51,6 +56,7 @@
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^1.7.0",
+    "eslint-plugin-workspaces": "^0.6.2",
     "prettier": "^2.3.2",
     "typescript": "^4.3.5"
   }

client/public/img/icon-github.svg

@@ -0,0 +1,34 @@
+.button {
+  cursor: pointer;
+  display: inline-block;
+  text-decoration: none;
+  padding: 1rem 1.4rem;
+  text-align: center;
+  font-size: 1.6rem;
+  display: flex;
+  align-items: center;
+  font-weight: 600;
+}
+
+.iconWrapper {
+  width: 2.6rem;
+  height: 2.6rem;
+  margin-right: 1rem;
+}
+
+.button img {
+  width: 100%;
+  height: 100%;
+}
+
+.github,
+.github:visited {
+  background-color: #333;
+  color: #fff;
+}
+
+.github:hover,
+.github:focus {
+  color: #fff;
+  background-color: #1f2937;
+}

client/src/assets/styles/button.module.css

@@ -0,0 +1,10 @@
+import { useAuth } from '@/hooks';
+
+const AppWrapper = ({ children }) => {
+  const { isLoading } = useAuth();
+
+  if (isLoading) return <p />;
+  return { children };
+};
+
+export default AppWrapper;

client/src/components/AppWrapper.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useReducer, memo } from 'react';
 import PropTypes from 'prop-types';
 import { Switch, SearchInput, Button, Pill } from 'evergreen-ui';
-import { useAuth, useSuggestions } from '@/services';
+import { useAuth, useSuggestions } from '@/hooks';
 import { normalizeString } from '../util';
 import { Student } from '../models';
 import { roles } from '../constants';

client/src/components/Filters.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Link from 'next/link';
-import { useAuth } from '@/services';
+import { useAuth } from '@/hooks';
 
 import styles from '@/assets/styles/header.module.css';
 

client/src/components/Header.jsx

@@ -13,7 +13,7 @@ import {
   Text
 } from 'evergreen-ui';
 import { DropTarget } from 'react-dnd';
-import { useAuth } from '@/services';
+import { useAuth } from '@/hooks';
 import { sortAlphabetically } from '../util';
 import ProjectModel from '../models/Project';