Skip to content

Commit

Permalink
merge main into this branch to resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@shubham-pandey-dev
shubham-pandey-dev committed Oct 30, 2022
2 parents 542fa9b + bfc97e2 commit 25b8d19
Show file tree
Hide file tree
Showing 10 changed files with 122 additions and 174 deletions.
11 changes: 6 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ This `CHEATSHEETS FOR DEVELOPERS` list has been made to enhance the workflow and
| 42 | ReactJS | React is a JavaScript library for building user interfaces. | [Click Here](./src/pages/sheet/react.md) |
| 43 | Regex | A regular expression, regex or regexp is a sequence of characters that define a search pattern. | [Click Here](./src/pages/sheet/regex.md) |
| 44 | Security Plus | Security+ is an IT security certification from CompTIA. | [Click Here](./src/pages/sheet/securityplus.md) |
| 45 | Vi Emacs Nano | Vi, Emacs, and Nano are three text editors that are available on most Linux distributions. | [Click Here](./src/pages/sheet/vi-emacs-nano.md) |
| 46 | VS Code | Visual Studio Code is a source-code editor made by Microsoft for Windows, Linux and macOS. | [Click Here](./src/pages/sheet/vscode.md) |
| 47 | VueJS | Vue.js is an open-source Model–view–viewmodel JavaScript framework for building user interfaces and single-page applications. | [Click Here](./src/pages/sheet/vue.md) |
| 48 | Windows Terminal | Windows Terminal is a new, modern, fast, efficient, powerful, and productive terminal application for users of command-line tools and shells like Command Prompt, PowerShell, and WSL. | [Click Here](./src/pages/sheet/windows-terminal.md) |
| 49 | Windows Shortcuts | Windows is a series of operating systems produced by Microsoft for use on personal computers, including home and business desktops, laptops, tablet PCs, and media center PCs. | [Click Here](./src/pages/sheet/windows.md) |
| 45 | Spring Boot | Spring Boot makes it easy to create stand-alone, production-grade Spring based Applications that you can "just run". | [Click Here](./src/pages/sheet/spring-boot.md) |
| 46 | Vi Emacs Nano | Vi, Emacs, and Nano are three text editors that are available on most Linux distributions. | [Click Here](./src/pages/sheet/vi-emacs-nano.md) |
| 47 | VS Code | Visual Studio Code is a source-code editor made by Microsoft for Windows, Linux and macOS. | [Click Here](./src/pages/sheet/vscode.md) |
| 48 | VueJS | Vue.js is an open-source Model–view–viewmodel JavaScript framework for building user interfaces and single-page applications. | [Click Here](./src/pages/sheet/vue.md) |
| 49 | Windows Terminal | Windows Terminal is a new, modern, fast, efficient, powerful, and productive terminal application for users of command-line tools and shells like Command Prompt, PowerShell, and WSL. | [Click Here](./src/pages/sheet/windows-terminal.md) |
| 50 | Windows Shortcuts | Windows is a series of operating systems produced by Microsoft for use on personal computers, including home and business desktops, laptops, tablet PCs, and media center PCs. | [Click Here](./src/pages/sheet/windows.md) |

---

Expand Down
12 changes: 5 additions & 7 deletions src/pages/sheet/competitive-programming-java.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public class Main {
}
```

**[🔼Back to Top](#table-of-contents)**

### template-using-buffered-reader-class

```java
Expand All @@ -63,8 +61,6 @@ public class Main {

```

**[🔼Back to Top](#table-of-contents)**

### template-using-custom-fast-reader-class

```java
Expand Down Expand Up @@ -125,7 +121,7 @@ public class Main {

## Basic Data Structures And Algorithms

### graph representation using Adjacency list
### graph-representation-using-Adjacency-list

```java
import java.util.ArrayList;
Expand Down Expand Up @@ -258,7 +254,7 @@ public class UnionFind {

**[🔼Back to Top](#table-of-contents)**

## Java specific competitive programming utility methods
## java-specific-competitive-programming-utility-methods

```java
public class JavaUtil {
Expand Down Expand Up @@ -310,4 +306,6 @@ public class JavaUtil {
}
}

```
```

**[🔼Back to Top](#table-of-contents)**
17 changes: 0 additions & 17 deletions src/pages/sheet/django.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@ Django is a high-level Python web framework that encourages rapid development an
| python manage.py inspectdb [table [table ...]] | To introspect the database tables in the database pointed-to by the NAME setting and outputs a Django model module (a models.py file) to standard output |
| python manage.py createcachetable | To Creates the cache tables for use with the database cache backend using the information from your settings file |

<<<<<<< HEAD

=======
| python manage.py optimizemigration app_label migration_name | To Optimize the operations for the named migration and overrides the existing file.
| python manage.py diffsettings | It displays differences between the current settings file and Django’s default settings (or another settings file specified by --default).
| python manage.py dumpdata [app_label[.ModelName] [app_label[.ModelName] ...]] | It outputs to standard output all data in the database associated with the named application(s).
**[🔼Back to Top](#table-of-contents)**

> > > > > > > b00d371e1e1a7274c54964b33b95484ba97e282a
## Django Model Layer

| Code | Description |
Expand Down Expand Up @@ -147,10 +137,3 @@ Comment 2
Comment 3
{% endcomment %}
```

<<<<<<< HEAD

=======
**[🔼Back to Top](#table-of-contents)**

> > > > > > > b00d371e1e1a7274c54964b33b95484ba97e282a
13 changes: 0 additions & 13 deletions src/pages/sheet/expressjs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ And then run

to install all necessary modules

# <<<<<<< HEAD:src/pages/sheet/expressjs.md

**[🔼Back to Top](#table-of-contents)**

> > > > > > > b00d371e1e1a7274c54964b33b95484ba97e282a:src/pages/sheet/expressjs-cheatsheet.md
## Start the server

add this code in app.js
Expand Down Expand Up @@ -63,13 +57,6 @@ Here, METHOD is an HTTP request method, and HANDLER is the function executed whe
res.sendFile(__dirname +'/views/index.html') ;
})

<<<<<<< HEAD:src/pages/sheet/expressjs.md

=======
**[🔼Back to Top](#table-of-contents)**

> > > > > > > b00d371e1e1a7274c54964b33b95484ba97e282a:src/pages/sheet/expressjs-cheatsheet.md
## Serve Static assets

Static assets include things like css files
Expand Down
4 changes: 2 additions & 2 deletions src/pages/sheet/html.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ HTML is a markup language for creating web pages and web applications. With Casc

## Input Types

| Field Type | HTML Code Notes |
| Field Type | HTML Code Notes | Description |
| :-------------: | ------------------------------------------------------- | -------------------------------------------------------------------------------------------- |
| plain text | `<input type="text">` | the type attribute can be omitted |
| password field | `<input type="password">` | echoes dots instead of characters |
| text area | `<textarea></textarea>` | a more customizable plain text area |
| checkbox | `<input type="checkbox">` | can be toggled on or off |
| radio button | `<input type="radio">` can be grouped with other inputs |
| radio button | `<input type="radio">`| can be grouped with other inputs |
| drop-down lists | `<select><option>` | [check here for more info](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) |
| file picker | `<input type="file">` | pops up an “open file” dialog |
| hidden field | `<input type="hidden">` | nothing there! |
Expand Down
Loading

0 comments on commit 25b8d19

Please sign in to comment.