Skip to content

Commit

Permalink
weekly promotion of develop to main (#324)
Browse files Browse the repository at this point in the history
* Private and Signed Out routes

* types

* Cleanup after conflicts

* Remove old bundle file

* Update src/utils/route/privateRoute.tsx

Co-authored-by: Dmitriy <[email protected]>

* generate opengraph previews for components (#312)

* chore: upgrade @near-js/biometric-ed25519 package (#289)

* feat: allow signIn with only LAK for no webauthn browsers (#308)

* fix: prevent the onboarding modal from flashing and only show the vscode banner during onboarding (#320)

* Update issue templates

* doc: adding contribution guides (#321)

* doc: addting contribution guides

* prettier fix

---------

Co-authored-by: marcinbodnar <[email protected]>
Co-authored-by: Caleb Jacob <[email protected]>
Co-authored-by: Marcin Bodnar <[email protected]>
Co-authored-by: Dmitriy <[email protected]>
Co-authored-by: Caleb Jacob <[email protected]>
Co-authored-by: Michael Peter <[email protected]>
Co-authored-by: Charles Garrett <[email protected]>
Co-authored-by: Danny Cho <[email protected]>
Co-authored-by: Osman Abdelnasir <[email protected]>
  • Loading branch information
10 people authored Jul 31, 2023
1 parent c50c6d6 commit 3abe35e
Show file tree
Hide file tree
Showing 20 changed files with 391 additions and 114 deletions.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
46 changes: 46 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
Thank you for your interest in contributing to the Blockchain Operating System reference gateway - Near Discovery. We welcome contributions from everyone. Below are various bits of information to help you get started. If you require additional help, please start a [Discussion](https://github.com/near/near-discovery/discussions).

## Next Steps

To learn more about how `near-discovery` works, checkout the guide to setup local development [here](https://github.com/near/near-discovery/blob/develop/README.md).


If you are looking for relatively simple tasks to familiarise yourself with
`near-discovery`, take a look at the issues labeled `good first issue`
[here](https://github.com/near/near-discovery/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22). If you see
one that looks interesting and is unassigned or has not been actively worked on
in some time, please go ahead and start working towards creating your first pull request.

If you have an idea for an enhancement to the Near Discovery, please submit a [feature request](https://github.com/near/near-discovery/issues/new?assignees=&labels=&projects=&template=feature_request.md&title=)

## Pull Requests

All the contributions to `near-discovery` happen via Pull Requests. Please follow the
following steps when creating a PR:

1. Fork the `near-discovery` repository and create a new branch to do you work there.
2. The branch can contain any number of commits. When merged, all commits will
be squashed into a single commit.
3. Thoroughly test your changes.
4. When ready, create a pull request against the `develop` branch of `near-discovery`.
5. Feel free to submit draft PRs to get early feedback and to make sure you are
on the right track.
6. The PR name should follow the template: `<type>: <name>`. Where `type` is:
- `fix` for bug fixes;
- `feat` for new features;
- `refactor` for changes that reorganize code without adding new content;
- `doc` for changes that change documentation or comments;
- `test` for changes that introduce new tests;
- `chore` for grunt tasks like updating dependencies.
7. The PR should also contain a description when appropriate to provide
additional information to help the reviewer inspect the proposed change.

## After the PR is submitted

1. When all the comments from the reviewer(s) have been addressed, the reviewer should
approve the PR.
2. An approved PR will be merged automatically into `develop`, which is continuously deployed to [beta.near.org](https://beta.near.org)


## Release Schedule
Changes from `develop` are promoted to the `main` branch weekly, on Thursdays.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@braintree/sanitize-url": "6.0.0",
"@keypom/selector": "1.2.3",
"@monaco-editor/react": "^4.4.6",
"@near-js/biometric-ed25519": "0.2.0",
"@near-js/biometric-ed25519": "0.3.0",
"@near-wallet-selector/core": "8.1.1",
"@near-wallet-selector/here-wallet": "8.1.1",
"@near-wallet-selector/meteor-wallet": "8.1.1",
Expand Down Expand Up @@ -65,7 +65,9 @@
"react-dom": "18.2.0",
"react-hook-form": "^7.43.9",
"react-singleton-hook": "^3.1.1",
"remark": "^14.0.3",
"rudder-sdk-js": "^2.36.0",
"strip-markdown": "^5.0.1",
"styled-components": "^5.3.6",
"typescript": "5.0.4",
"zustand": "^4.3.7"
Expand Down
71 changes: 52 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions public/main.856359197271b22b7be9.bundle.js

This file was deleted.

3 changes: 2 additions & 1 deletion src/components/lib/Toast/Toaster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export function Toaster() {

const iconsByType: Record<ToastType, string> = {
INFO: 'ph ph-info',
WARNING: 'ph ph-warning',
ERROR: 'ph ph-warning-circle',
SUCCESS: 'ph ph-check-circle',
};
Expand Down Expand Up @@ -36,7 +37,7 @@ export function Toaster() {
{toast.description && <T.Description>{toast.description}</T.Description>}
</T.Content>

<T.CloseButton />
<T.CloseButton data-type={type} />
</T.Root>
);
})}
Expand Down
2 changes: 1 addition & 1 deletion src/components/lib/Toast/store.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { create } from 'zustand';

export type ToastType = 'INFO' | 'ERROR' | 'SUCCESS';
export type ToastType = 'INFO' | 'ERROR' | 'SUCCESS' | 'WARNING';

export interface Toast {
description?: string;
Expand Down
8 changes: 8 additions & 0 deletions src/components/lib/Toast/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ export const Root = styled(ToastPrimitive.Root)`
&[data-type='INFO'] {
background: var(--sand12);
}
&[data-type='WARNING'] {
background: var(--amber4);
color: var(--amber12);
}
`;

export const Content = styled.div`
Expand Down Expand Up @@ -115,4 +119,8 @@ export const CloseButton = styled(ToastPrimitive.Close)`
i {
font-size: 0.8rem;
}
&[data-type='WARNING'] {
color: var(--amber12);
}
`;
4 changes: 2 additions & 2 deletions src/components/sandbox/Sandbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ export const Sandbox = ({ onboarding = false }) => {
handleCommit={handleCommit}
filesObject={filesObject}
/>
{onboarding || (
{onboarding && (
<Welcome
setShowModal={setShowModal}
createFile={createFile}
Expand All @@ -543,7 +543,7 @@ export const Sandbox = ({ onboarding = false }) => {
/>
)}
<div className={showEditor ? `` : ``}>
{onboarding || <VsCodeBanner />}
{onboarding && <VsCodeBanner />}
{onboarding && <BannerOboarding handleExitOnboarding={handleExitOnboarding} />}

<div className="container-fluid mt-1" style={{ position: 'relative' }}>
Expand Down
Loading

2 comments on commit 3abe35e

@vercel
Copy link

@vercel vercel bot commented on 3abe35e Jul 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on 3abe35e Jul 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.