Commit Graph

72 Commits

Author SHA1 Message Date
b38peng da4742ba81 pr comment fixes
continuous-integration/drone/push Build is passing Details
2021-08-05 18:18:34 -03:00
b38peng b14e196a4f Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/www-new into feat/meet-the-team-page 2021-08-05 11:56:27 -03:00
Aditya Thakral af8c750c0c Change CSS variable names + create a themer (#109)
continuous-integration/drone/push Build is passing Details
Try it out at https://csclub.uwaterloo.ca/~a3thakra/website-demo/themer/

- Themes persist across website reloads
- Individual color reset buttons
- Reset all colors button

Reviewed-on: #109
Reviewed-by: n3parikh <n3parikh@localhost>
Reviewed-by: b38peng <b38peng@uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-08-03 19:37:02 -04:00
Neil Parikh b281572116 Script to deploy site to your CSC website (#99)
continuous-integration/drone/push Build is passing Details
Co-authored-by: Neil Parikh <n3parikh@csclub.uwaterloo.ca>
Reviewed-on: #99
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: n3parikh <n3parikh@localhost>
Co-committed-by: n3parikh <n3parikh@localhost>
2021-08-03 19:17:08 -04:00
Renovate Bot c4c0be9861 Update dependency eslint to v7.32.0 (#121)
continuous-integration/drone/push Build is passing Details
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [eslint](https://eslint.org) ([source](https://github.com/eslint/eslint)) | devDependencies | minor | [`7.31.0` -> `7.32.0`](https://renovatebot.com/diffs/npm/eslint/7.31.0/7.32.0) |

⚠️ Release Notes retrieval for this PR were skipped because no github.com credentials were available.
If you are using the hosted GitLab app, please follow [this guide](https://docs.renovatebot.com/install-gitlab-app/#configuring-a-token-for-githubcom-hosted-release-notes). If you are self-hosted, please see [this instruction](https://github.com/renovatebot/renovate/blob/master/docs/usage/self-hosting.md#githubcom-token-for-release-notes) instead.

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Reviewed-on: #121
Co-authored-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
Co-committed-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
2021-08-02 16:00:23 -04:00
Aditya Thakral 6d5de0ff7e Upgrade Next, React, TypeScript (#91)
continuous-integration/drone/push Build is passing Details
closes #41

# Steps for reviewing

1. `git checkout adi-upgrade-deps`
1. `git clean -xfd`
1. `npm i`
1. `npm run dev`
1. make sure everything looks normal

Reviewed-on: #91
Reviewed-by: n3parikh <n3parikh@localhost>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-08-01 17:54:25 -04:00
Aditya Thakral 1fb308327f TechTalk Card + mini tech card (#71)
continuous-integration/drone/push Build is passing Details
fixes #35 and #34
- extra padding below poster image

Co-authored-by: catherine-w <37776108+catherine-w@users.noreply.github.com>
Co-authored-by: c29wan <c29wan@localhost>
Reviewed-on: #71
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-29 16:56:47 -04:00
Amy Wang 6a64013e5c Home Page UI (#88)
continuous-integration/drone/push Build is passing Details
Desktop and Mobile versions of the home page UI.

Closes #4 (we can create new issues for the remaining tasks)

Co-authored-by: Amy <minds10@hotmail.com>
Reviewed-on: #88
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-committed-by: Amy <a258wang@csclub.uwaterloo.ca>
2021-07-27 02:13:34 -04:00
Renovate Bot 507f9806c3 Configure Renovate (#100)
continuous-integration/drone/push Build is passing Details
Welcome to [Renovate](https://github.com/renovatebot/renovate)! This is an onboarding PR to help you understand and configure settings before regular Pull Requests begin.

🚦 To activate Renovate, merge this Pull Request. To disable Renovate, simply close this Pull Request unmerged.

Closes #92

---
### Detected Package Files

 * `.drone.yml` (droneci)
 * `package.json` (npm)

### What to Expect

With your current configuration, Renovate will create 7 Pull Requests:

<details>
<summary>Update dependency react to v17.0.2</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/react-17.x`
  - Merge into: `main`
  - Upgrade [react](https://github.com/facebook/react) to `17.0.2`

</details>

<details>
<summary>Update dependency react-dom to v17.0.2</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/react-dom-17.x`
  - Merge into: `main`
  - Upgrade [react-dom](https://github.com/facebook/react) to `17.0.2`

</details>

<details>
<summary>Update dependency @&#8203;next/mdx to v11</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/next-mdx-11.x`
  - Merge into: `main`
  - Upgrade [@next/mdx](https://github.com/vercel/next.js) to `^11.0.0`

</details>

<details>
<summary>Update dependency next to v11</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/next-11.x`
  - Merge into: `main`
  - Upgrade [next](https://github.com/vercel/next.js) to `^11.0.0`

</details>

<details>
<summary>Update dependency remark to v13</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/remark-13.x`
  - Merge into: `main`
  - Upgrade [remark](https://github.com/remarkjs/remark) to `^13.0.0`

</details>

<details>
<summary>Update dependency remark-html to v13</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/remark-html-13.x`
  - Merge into: `main`
  - Upgrade [remark-html](https://github.com/remarkjs/remark-html) to `^13.0.0`

</details>

<details>
<summary>Update node Docker tag to v16</summary>

  - Schedule: ["at any time"]
  - Branch name: `renovate/node-16.x`
  - Merge into: `main`
  - Upgrade [node](https://github.com/nodejs/node) to `16`
  - Upgrade [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped) to `^16.0.0`

</details>

---

 Got questions? Check out Renovate's [Docs](https://docs.renovatebot.com/), particularly the Getting Started section.
If you need any further assistance then you can also [request help here](https://github.com/renovatebot/renovate/discussions).

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Co-authored-by: Renovate Bot <no-reply@csclub.uwaterloo.ca>
Reviewed-on: #100
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Renovate Bot <syscom+renovate@csclub.uwaterloo.ca>
Co-committed-by: Renovate Bot <syscom+renovate@csclub.uwaterloo.ca>
2021-07-27 02:11:07 -04:00
Aditya Thakral 1ff1c7f78d Use ConnectWithUs and EmailSignup components on the /about page (#93)
continuous-integration/drone/push Build is passing Details
Reviewed-on: #93
Reviewed-by: Amy <a258wang@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-27 02:06:37 -04:00
b38peng 9964e54d69 our supporters margin fix
continuous-integration/drone/push Build is passing Details
2021-07-25 12:23:07 -03:00
Aditya Thakral ed3c3939e5 Standardize h1, h2, h3, h4, p margins (#90)
continuous-integration/drone/push Build is passing Details
Reviewed-on: #90
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-25 10:59:40 -04:00
b38peng 935c591a38 reset settings
continuous-integration/drone/push Build is passing Details
2021-07-24 21:59:01 -03:00
b38peng 422da398f8 added codey
continuous-integration/drone/push Build is passing Details
2021-07-24 21:49:33 -03:00
b38peng f9345330c1 minor cleanup
continuous-integration/drone/push Build is passing Details
2021-07-24 15:49:09 -03:00
b38peng d296fe2d7b mobile team member card
continuous-integration/drone/push Build is passing Details
2021-07-24 15:33:02 -03:00
b38peng 801a200664 dynamic importing!! 2021-07-23 20:48:02 -03:00
b38peng 1a0ab90b11 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/www-new into feat/meet-the-team-page 2021-07-22 19:10:03 -03:00
Aditya Thakral 360d9e4b6f Get Involved Page! (#76)
continuous-integration/drone/push Build is passing Details
closes #13 and #24

- added the `<EmailSignup>` and `<ConnectWithUs>` components!
- adds the Get Involved Page

Co-authored-by: dora <d43su@uwaterloo.ca>
Co-authored-by: dora <d43su@csclub.uwaterloo.ca>
Reviewed-on: #76
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-22 14:42:38 -04:00
b38peng 201401a5c6 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/www-new into feat/meet-the-team-page 2021-07-21 21:12:34 -03:00
Aditya Thakral f670247ec5 About Us page (#70)
continuous-integration/drone/push Build is passing Details
Fixes #7

Co-authored-by: Linna Luo <linnaluo18@gmail.com>
Reviewed-on: #70
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-18 03:37:48 -04:00
b38peng ec15808af7 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/www-new into feat/meet-the-team-page 2021-07-12 16:05:18 -03:00
Aditya Thakral 44621b2daf Add next-mdx-remote (#82)
continuous-integration/drone/push Build is passing Details
Closes #80

# Example

```ts
// lib/events.ts

import matter from "gray-matter";
import { serialize } from "next-mdx-remote/serialize";

export async function getEvent() {
  // you should use the "fs" nodejs api here
  const fileAfterReading = `
---
title: A title
online: false
location: MC
---

## Alt Tab

Wooohooo
  `.trim();

  const { content, data } = matter(fileAfterReading);
  const serialized = await serialize(content, { scope: data });

  return { serialized, data };
}
```

```tsx
// your-page.tsx

import { GetStaticProps } from "next";
import { MDXRemote } from "next-mdx-remote";
import React from "react";
import { getEvent } from "lib/events";

export default function MyPage(props) {
  return (
    <>
      <div>
        {...other stuff}
      </div>
      <MDXRemote {...props.serialized} />
    </>
  );
}

export const getStaticProps: GetStaticProps = async () => {
  const { serialized, data } = await getEvent();

  return {
    props: {
      serialized,
      data,
    },
  };
};

```

Reviewed-on: #82
Reviewed-by: n3parikh <n3parikh@localhost>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-11 16:07:55 -04:00
b38peng e2053e62b1 mobile exec popup
continuous-integration/drone/push Build is passing Details
2021-07-11 14:13:20 -03:00
b38peng df4660c64b Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/www-new into feat/meet-the-team-page 2021-07-10 13:32:14 -03:00
b38peng 5d343f1186 edit members 2021-07-10 12:47:41 -03:00
Aditya Thakral b8a7957beb Mobile Navbar (#75)
continuous-integration/drone/push Build is passing Details
The mobile navbar is done (finally!), except for a swipe gesture to close the navbar.

Closes #30 and #2

Co-authored-by: Amy
Reviewed-on: #75
Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-07-07 18:13:39 -04:00
b38peng ccdac0c194 mobile styling 2021-07-03 17:44:21 -03:00
b38peng 639725f3a4 added team members 2021-07-03 16:14:43 -03:00
b38peng 29773d79ba styling + add placeholders 2021-06-30 16:49:28 -03:00
Bonnie 5d0de1ff03 meet the team draft 2021-06-29 18:51:16 -03:00
Aditya Thakral 5fad324b30 Add drone.yml (#77)
continuous-integration/drone/push Build is passing Details
Removes gitlab ci and adds .drone.yml

Still need to setup autodepoly for staging websites, but that's for later.

Co-authored-by: Aditya Thakral <aditya.thakral@uwaterloo.ca>
Reviewed-on: #77
Reviewed-by: n3parikh <n3parikh@localhost>
Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
2021-06-29 15:08:05 -04:00
Adi Thakral 93ede558a4 Fix font-size, line-height, and some other smaller changes 2021-06-27 03:33:09 +00:00
Bonnie Peng 48056ca82e Event Description Card: Logo update 2021-06-24 02:10:51 +00:00
Bonnie Peng ae8e84564b Our Supporters Page 2021-06-22 01:22:54 +00:00
Neil Parikh 23558a2b2b fix date format in after hours 2021-06-13 21:32:28 -04:00
Linhui Luo 7a08e0c331 Footer 2021-06-13 23:55:25 +00:00
Catherine Wan 078276efa7 Link Component 2021-06-13 19:36:34 +00:00
Linna Luo 426c81360e Fix MiniEventCard drop down icon styling 2021-06-10 01:39:37 +00:00
William Tran dc0cc390c1 OrganizedContent 2021-06-10 01:12:44 +00:00
Bonnie Peng 2594a72fdb Mobile EventDescriptionCard 2021-06-09 11:16:40 +00:00
Aditya Thakral 2b733ade44 Use NEXT_PUBLIC_ prefix for base path 2021-06-07 21:51:02 -04:00
Aditya Thakral 66f9d93d8e Only run deploy_staging on main branch 2021-06-07 21:15:21 -04:00
Aditya Thakral 699a0836b4 Fix ci lint errors 2021-06-07 21:13:32 -04:00
Aditya Thakral 102023ec2c Add job to update staging website 2021-06-07 21:04:55 -04:00
Aditya Thakral 26b279e71d Use custom link for MDX 2021-06-07 20:55:37 -04:00
Adi Thakral b494c9ee16 Staging website 2021-06-08 00:18:15 +00:00
Bonnie Peng 13c20dd88f Add Button component 2021-06-01 04:45:52 +00:00
Dora Su 1a784a9984 Add new routes to the navbar 2021-05-26 16:13:54 +00:00
Aditya Thakral 4f5496ba8c Use 16px as default font-size for desktops 2021-05-24 15:27:44 -04:00