Skip to content

Commit fdb6514

Browse files
3bobchenShzmj
andauthored
feat: Add devsoc name and replace most csesoc references (#803)
* feat: Add devsoc logo and replace most csesoc references * update github source link * updated code owners and devsoc github links * updated links in onboarding and codeowners devsoc technical --------- Co-authored-by: Shaam <[email protected]>
1 parent 1d10b89 commit fdb6514

File tree

7 files changed

+46
-40
lines changed

7 files changed

+46
-40
lines changed

CODEOWNERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
auto_server/ @csesoc/notangles-leads
2-
client/ @csesoc/notangles-leads
3-
server/ @csesoc/notangles-leads
1+
auto_server/ @devsoc-unsw/notangles-leads
2+
client/ @devsoc-unsw/notangles-leads
3+
server/ @devsoc-unsw/notangles-leads
44

5-
.github/ @csesoc/technical
6-
renovate.json @csesoc/technical
5+
.github/ @devsoc-unsw/platform
6+
renovate.json @devsoc-unsw/platform

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Notangles
22

3-
Copyright (C) 2023 CSESoc UNSW
3+
Copyright (C) 2023 DevSoc UNSW
44

55
This program is free software: you can redistribute it and/or modify it under
66
the terms of the GNU Affero General Public License as published by the Free
@@ -37,7 +37,7 @@ party components included in the software.
3737
6. If you use this software in a product that is freely available to the
3838
public, you must give full credit to the original authors of the software by
3939
prominently displaying the following attribution in the product: "This product
40-
includes software developed by CSESoc UNSW."
40+
includes software developed by DevSoc UNSW."
4141

4242
7. This license extension shall not be interpreted to affect the validity or
4343
enforceability of the AGPL-v3 license.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Before you start, make sure that you have the following software installed.
2222

2323
Clone the repository:
2424

25-
`git clone [email protected]:csesoc/notangles.git`
25+
`git clone [email protected]:devsoc-unsw/notangles.git`
2626

2727
### Running the front-end
2828

client/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
/>
1515
<meta
1616
name="description"
17-
content="An interactive drag-and-drop timetable planner to help UNSW students plan and organise their course classes every trimester. Created by CSESoc Dev, we have many features including support for your own custom events, auto-timetabling, creation of multiple timetables and sharing events with friends. Organise your studies, find ideal class times with friends and take control of your academic life. Start planning now!"
17+
content="An interactive drag-and-drop timetable planner to help UNSW students plan and organise their course classes every trimester. Created by DevSoc, we have many features including support for your own custom events, auto-timetabling, creation of multiple timetables and sharing events with friends. Organise your studies, find ideal class times with friends and take control of your academic life. Start planning now!"
1818
/>
1919
<meta
2020
name="keywords"
21-
content="notangles, crossangles, bojangles, UNSW, timetable, timetabler, planner, plan, calendar, trimester, trimesters, semester, term, social timetabling, schedule, csesoc, myUNSW, student, academic, organise, organize, courses, classes, auto-timetabler, University of New South Wales, tool, study, app, manage, personalise, customise"
21+
content="notangles, crossangles, bojangles, UNSW, timetable, timetabler, planner, plan, calendar, trimester, trimesters, semester, term, social timetabling, schedule, csesoc, devsoc, myUNSW, student, academic, organise, organize, courses, classes, auto-timetabler, University of New South Wales, tool, study, app, manage, personalise, customise"
2222
/>
2323
<link rel="manifest" href="/manifest.json" />
2424
<link rel="apple-touch-icon" href="/icon-192x192.png" />

client/src/components/Footer.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const Footer: React.FC = () => {
4646
<div>
4747
<h1 style={{ fontSize: '14px' }}>Notangles - UNSW Timetable Planner</h1>
4848
<p>
49-
Notangles is a UNSW timetable planner, brought to you by CSESoc Dev. It's an easy to use drag-and-drop tool
49+
Notangles is a UNSW timetable planner, brought to you by DevSoc. It's an easy to use drag-and-drop tool
5050
that allows you to plan your course classes and add to your calendar, even before term class registration
5151
opens! We have many features including support for custom events, auto-timetabling, creation of multiple
5252
timetables and sharing events with friends.
@@ -58,7 +58,7 @@ const Footer: React.FC = () => {
5858
reliability.
5959
</div>
6060
<div>
61-
Made by &gt;_ CSESoc UNSW&nbsp;&nbsp;•&nbsp;&nbsp;
61+
Made by Software Development Society (DevSoc)&nbsp;&nbsp;•&nbsp;&nbsp;
6262
<Link target="_blank" href="mailto:[email protected]">
6363
Email
6464
</Link>
@@ -67,7 +67,7 @@ const Footer: React.FC = () => {
6767
Feedback
6868
</Link>
6969
&nbsp;&nbsp;•&nbsp;&nbsp;
70-
<Link target="_blank" href="https://github.com/csesoc/notangles">
70+
<Link target="_blank" href="https://github.com/devsoc-unsw/notangles">
7171
Source
7272
</Link>
7373
</div>

client/src/components/navbar/About.tsx

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,55 +26,62 @@ const FeatList = styled('ul')`
2626
const About: React.FC = () => {
2727
return (
2828
<>
29-
<Typography gutterBottom variant="body2">
29+
<Typography gutterBottom variant='body2'>
3030
Notangles is an app for UNSW students to build their perfect timetable, even before class registration opens. We
3131
have many features on the way, including support for your own custom events, and syncing your timetable with
3232
friends.
3333
</Typography>
34-
<Typography gutterBottom variant="body2">
34+
<Typography gutterBottom variant='body2'>
3535
Inspired by&nbsp;
36-
<Link href="https://tdransfield.net/projects/bojangles/" target="_blank">
36+
<Link href='https://tdransfield.net/projects/bojangles/' target='_blank'>
3737
Bojangles
3838
</Link>
3939
&nbsp;and&nbsp;
40-
<Link href="https://crossangles.app/" target="_blank">
40+
<Link href='https://crossangles.app/' target='_blank'>
4141
Crossangles
4242
</Link>
4343
, it was created by CSESoc Projects – a place for student-led projects where you can learn something new, and
44-
make some friends along the way. Notangles is free and{' '}
45-
<Link href="https://github.com/csesoc/notangles">open-source</Link>.
44+
make some friends along the way.
4645
</Typography>
47-
<StyledTypography variant="h6">How it works</StyledTypography>
48-
<Typography gutterBottom variant="body2">
46+
<Typography gutterBottom variant='body2'>
47+
In 2024, Software Development Society has assumed management for Notangles, formed by the creation of a new
48+
student society from what was previously known as CSESoc Projects.
49+
</Typography>
50+
<Typography gutterBottom variant='body2'>
51+
Notangles is free and{' '}
52+
<Link href='https://github.com/devsoc-unsw/notangles'>open-source</Link>.
53+
</Typography>
54+
<StyledTypography variant='h6'>How it works</StyledTypography>
55+
<Typography gutterBottom variant='body2'>
4956
Select your courses, then drag-and-drop classes to customise your timetable. You can drag clutter (like lectures
5057
which you aren’t going to watch live) to the unscheduled column. Struggling to find an ideal timetable? Try out
5158
our auto-timetabling feature!
5259
</Typography>
53-
<HowToUseImg src={useGif} alt="how to use gif" />
54-
<Typography gutterBottom variant="body2">
60+
<HowToUseImg src={useGif} alt='how to use gif' />
61+
<Typography gutterBottom variant='body2'>
5562
Note: Notangles does not enroll in your classes. It’s a tool for planning your timetable, but you’ll still need
5663
to officially enroll at&nbsp;
57-
<Link href="https://my.unsw.edu.au/" target="_blank">
64+
<Link href='https://my.unsw.edu.au/' target='_blank'>
5865
myUNSW
5966
</Link>
6067
.
6168
</Typography>
62-
<StyledTypography variant="h6">Future developments</StyledTypography>
69+
<StyledTypography variant='h6'>Future developments</StyledTypography>
6370
<FeatList>
6471
<li> Sync your timetable with friends</li>
6572
</FeatList>
66-
<StyledTypography variant="h6">About the team</StyledTypography>
67-
<Typography gutterBottom variant="body2">
73+
<StyledTypography variant='h6'>About the team</StyledTypography>
74+
<Typography gutterBottom variant='body2'>
6875
The current 2023 development team consists of two directors and seven members.
6976
</Typography>
70-
<Typography gutterBottom variant="body2">
77+
<Typography gutterBottom variant='body2'>
7178
<strong>Team Directors:</strong>
7279
</Typography>
7380
<FeatList>
7481
<li>Manhua Lu</li>
7582
<li>Raiyan Ahmed</li>
7683
</FeatList>
77-
<Typography gutterBottom variant="body2">
84+
<Typography gutterBottom variant='body2'>
7885
<strong>Members:</strong>
7986
</Typography>
8087
<FeatList>
@@ -86,14 +93,14 @@ const About: React.FC = () => {
8693
<li>Sijin Soon</li>
8794
<li>Wanning Cai</li>
8895
</FeatList>
89-
<StyledTypography variant="h6">Disclaimer</StyledTypography>
90-
<Typography gutterBottom variant="body2">
96+
<StyledTypography variant='h6'>Disclaimer</StyledTypography>
97+
<Typography gutterBottom variant='body2'>
9198
While we try our best, Notangles is not an official UNSW site, and cannot guarantee data accuracy or
9299
reliability.
93100
</Typography>
94-
<Typography gutterBottom variant="body2">
101+
<Typography gutterBottom variant='body2'>
95102
If you find an issue or have a suggestion, please{' '}
96-
<Link href="https://forms.gle/rV3QCwjsEbLNyESE6" target="_blank">
103+
<Link href='https://forms.gle/rV3QCwjsEbLNyESE6' target='_blank'>
97104
let us know
98105
</Link>
99106
.

onboarding.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Onboarding
22

3-
Welcome to CSESoc Projects and the Notangles team! This page will come in handy when you’re running Notangles locally, and working on your own features.
3+
Welcome to DevSoc and the Notangles team! This page will come in handy when you’re running Notangles locally, and working on your own features.
44

55
## Your setup
66

@@ -37,14 +37,13 @@ Before you start, make sure that you have the following software installed.
3737
- [Docker](https://www.docker.com/) (only needed if you are working on the back-end)
3838
- [Instructions if you’re using WSL on Windows](https://docs.microsoft.com/en-us/windows/wsl/tutorials/wsl-containers)
3939

40-
4140
## Getting the source code
4241

43-
We manage our source code with a version control system called [Git](https://git-scm.com/). Every time we *commit* new code, it gets added to a history of commits, so we can get old code back if needed. This code is then hosted on [GitHub](https://github.com/csesoc/notangles), so any code you *push* is backed up, and can be *pulled* by other team members. Git has other features like branches, which allow us to work on different versions of the same codebase at the same time, and merge them together later.
42+
We manage our source code with a version control system called [Git](https://git-scm.com/). Every time we _commit_ new code, it gets added to a history of commits, so we can get old code back if needed. This code is then hosted on [GitHub](https://github.com/devsoc-unsw/notangles), so any code you _push_ is backed up, and can be _pulled_ by other team members. Git has other features like branches, which allow us to work on different versions of the same codebase at the same time, and merge them together later.
4443

45-
First of all, make sure that you have been added to the [Notangles repository](https://github.com/csesoc/notangles) on GitHub. While anyone can read our open-source codebase, you’ll need permissions to push changes.
44+
First of all, make sure that you have been added to the [Notangles repository](https://github.com/devsoc-unsw/notangles) on GitHub. While anyone can read our open-source codebase, you’ll need permissions to push changes.
4645

47-
Once you’re in, summon a terminal and clone the repository by running `git clone [email protected]:csesoc/notangles.git`. (You can also use GitHub Desktop.) After that, navigate into the newly-cloned repository by running `cd notangles`.
46+
Once you’re in, summon a terminal and clone the repository by running `git clone [email protected]:devsoc-unsw/notangles.git`. (You can also use GitHub Desktop.) After that, navigate into the newly-cloned repository by running `cd notangles`.
4847

4948
Then, run `cd client && npm install && cd ../server && npm install && cd ../scraper && npm install && cd ..`, which installs all the dependencies that the project needs.
5049

@@ -89,6 +88,6 @@ Then, push the branch to the Notangles repository by running `git push -u origin
8988

9089
When you’re done with the issue, [create a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request) on GitHub, then assign as reviewers the team lead, and members with experience in the area.
9190

92-
When your pull request has been approved and merged into the *dev* branch, you can archive the card on Trello. All archived cards can be referenced from “archived items”, under “more” in the Trello menu.
91+
When your pull request has been approved and merged into the _dev_ branch, you can archive the card on Trello. All archived cards can be referenced from “archived items”, under “more” in the Trello menu.
9392

94-
As a side note, **make sure to always pull from *dev*** before you do any work! This is so you can get the latest code to work on, with all the new changes from other team members.
93+
As a side note, **make sure to always pull from _dev_** before you do any work! This is so you can get the latest code to work on, with all the new changes from other team members.

0 commit comments

Comments
 (0)